Merge
authorTim Deegan <Tim.Deegan@xensource.com>
Mon, 24 Sep 2007 13:04:36 +0000 (14:04 +0100)
committerTim Deegan <Tim.Deegan@xensource.com>
Mon, 24 Sep 2007 13:04:36 +0000 (14:04 +0100)

Trivial merge